Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

User/bgr/ideal hurricane #251

Merged
merged 10 commits into from
Oct 22, 2018
Merged

User/bgr/ideal hurricane #251

merged 10 commits into from
Oct 22, 2018

Conversation

breichl
Copy link

@breichl breichl commented Oct 17, 2018

Add idealized_hurricane test case to ocean_only.

  • This P/R has been confirmed to not change answers in ocean_only and ice_ocean_SIS2 experiments if taken in conjunction with forthcoming MOM6 P/R (user/bgr/ideal_hurricane_config).
  • Key feature is addition of new test case idealized_hurricane and associated input files.
  • The SCM_idealized_hurricane routine was completely changed so it can be used to map both single location and 3d wind from the parametric (Holland, 1980) wind profile. These changes have been updated in the SCM_idealized_hurricane ocean_only test case input files.
  • The SCM_idealized_hurricane routine previously also contained a TS initialization that is removed in user/bgr/ideal_hurricane_config MOM6 P/R because of redundancy with the CVMix_tests TS initialization (which should ultimately be relocated into the main state initialization). Therefore CVMix_SCM_tests folder in ocean_only has been updated to use the CVMix_tests TS instead of the idealized hurricane TS initialization.
  • The CVMix_SCM_tests folder was renamed from CVmix_SCM_tests folder to agree with convention of using "CVMix". This rename is unrelated to the rest of the P/R, so could be reverted if it is more trouble than its worth.
  • All MOM_parameter_doc.___ files have been updated according to the new options.

brandon.reichl added 9 commits August 16, 2018 21:01
Adding new ideal_hurricane test case
93be8ff 
- A 3d implementation of the SCM_ideal_hurricane case
- Work to be done for choosing resolution/parameterizations/etc in MOM_input
Updating input files in CVMix test cases
f95ad83 
 - Previously the MOM_input files used the ideal_hurr TS initialization class. This class is removed in a subsequent PR to MOM6, since it is redundant and has less features than the CVMix TS initialization class. So in preperation, this P/R changes the MOM_input to use the CVMix TS class, which does not change answers since it had the same capabilities..
Update to SCM_idealized_hurricane test case MOM_input file.
e500d54 
 - The ideal_hurricane case no longer supports a TS class, since its functionality was moved to SCM_CVMix.  Therefore, the SCM_idealized_hurricane test case is updated to use the CVMix TS initilazation.  Additionally, the MOM_parameter_doc.all and MOM_parameter_doc.short for both the SCM_idealized_hurricane case and the CVmix_SCM_tests cases were updated to reflect the new code.
Renamed CVmix_SCM_tests folder to CVMix_SCM_tests
158d51d
Merge branch 'IdealHurricane' into user/bgr/ideal_hurricane
d1f5614
Modifications to run the idealized_hurricane (3d) test case.
df8432a 
 - MOM_input changed for a .1 day simulation for the test case.
 - MOM_parameter files added
 - .nc file added from .cdl file for vertical grid.
 - ideal_hurr TS class changed to CVMix TS class for a corresponding PR to MOM6.
 - This test-case also relies on a corresponding PR to MOM6
Merge branch 'dev/gfdl' into user/bgr/ideal_hurricane
a022d67
Updated CVMix_SCM_tests skin_warming_wind case for interior dtdz=0 (a…
8297256 
…s in dev/gfdl).

- dtdz was updated in MOM_override to be 0 in dev/gfdl, this commit is fixed to reflect that using the new scm TS init routine.
Updates to input parameters inidealized_hurricane test case
11296a5
@breichl breichl mentioned this pull request Oct 17, 2018
Merged
@breichl
Copy link
Author

breichl commented Oct 17, 2018

See MOM6: https://github.com/NOAA-GFDL/MOM6/pull/860

Reverting rename of 'CVmix_SCM_tests' to 'CVMix_SCM_tests'.
871ef70 
- Changing the name of a directory with ~100 subdirectories as part of a larger P/R made the resulting code/answers difficult to verify for consistency.
- Reverting to name CVmix_SCM_tests to streamline the original P/R.
- The renaming of the directory can be redone in its own commit and P/R with no other changes (if desired).
@Hallberg-NOAA
Copy link
Member

Thanks for this PR, @breichl. However changing the directory name from CVmix_SCM_tests folder to CVMix_SCM_tests is disrupting our testing of this and the other changes. If there is any way that you could revert that specific change so that we can separately accept the code changes, that would be helpful for the testing process.

@Hallberg-NOAA Hallberg-NOAA merged commit 871ef70 into NOAA-GFDL:dev/gfdl Oct 22, 2018
mom6bot added a commit to mom6bot/MOM6-examples that referenced this pull request Oct 25, 2023
@mom6bot
MOM6: ice shelf dHdt and optimization
48f7d1f 
- NOAA-GFDL/MOM6@c9fc30d61 ice shelf dHdt and optimization
- NOAA-GFDL/MOM6@3d07e5beb Comment omega_w2x entries in nuopc_cap
- NOAA-GFDL/MOM6@3720b9920 Comment all omega_w2x entries
- NOAA-GFDL/MOM6@e2bbb08dc Set fpmix to false by default
- NOAA-GFDL/MOM6@5e6e6576f remove fms_io_mod import
- NOAA-GFDL/MOM6@de55fd6d2 fix multiinstance log filename correction and remove FMS1 io api calls.
- NOAA-GFDL/MOM6@d363034fc Deprecate mct cap (NOAA-GFDL#257)
- NOAA-GFDL/MOM6@5bc0c5e07 Pass wavebands from coupler to wave_parameters_CS (NOAA-GFDL#255)
- NOAA-GFDL/MOM6@be40a4136 add run time info (NOAA-GFDL#114)
- NOAA-GFDL/MOM6@d9aa751a4 Revert order of variables in vertFPmix
- NOAA-GFDL/MOM6@66fd876af Removed L_diag and moved variables in vertFPmix
- NOAA-GFDL/MOM6@7b7052e9b Describe local variables and make code consistent
- NOAA-GFDL/MOM6@d4aa10857 Add Leith+E (NOAA-GFDL#251)
- NOAA-GFDL/MOM6@c57789f41  Rearrange do-loops and if statements
- NOAA-GFDL/MOM6@2f34d6521 Merge latest mom-ocean main (NOAA-GFDL#254)
- NOAA-GFDL/MOM6@8ec0de7b0 Merge remote-tracking branch 'MAIN/main' into feature/update-to-main-20230811
- NOAA-GFDL/MOM6@27518f750 Make neutral diffusion work with 3D diffusivities
- NOAA-GFDL/MOM6@a58803372 Make HBD work with 3D diffusivities
- NOAA-GFDL/MOM6@36c1e266b Make tracer diffusivities 3D
- NOAA-GFDL/MOM6@cf29f1beb Allocate hbl
- NOAA-GFDL/MOM6@53ccbc329 Fix line length
- NOAA-GFDL/MOM6@8234e696d Add hbd to the control structure
- NOAA-GFDL/MOM6@b4bd22322 Output relevant fields when diff or visc < 0
- NOAA-GFDL/MOM6@61baca8ea Option to taper neutral diffusion
- NOAA-GFDL/MOM6@8812ba999 Merge remote-tracking branch 'gustavo/fpmix_draft_17may2022' into fpmix_draft_18April2023
- NOAA-GFDL/MOM6@32b969ef4 Accommodate multi-instance runs in CESM (NOAA-GFDL#241)
- NOAA-GFDL/MOM6@ebf11d7c7 migrate nearly all refs to CFC_cap into MOM_tracer_flow_control and MOM_CFC_cap
- NOAA-GFDL/MOM6@a697159a2 Obsolete the USE_LATERAL_BOUNDARY_DIFFUSION option
- NOAA-GFDL/MOM6@eff5036e0 Unit tests and final cleaning
- NOAA-GFDL/MOM6@b85581ea8 read atm CFC hemispheric aveages from CFC_BC_FILE, instead of 2D fields
- NOAA-GFDL/MOM6@db06a5494 add CFC_BC_year_offset, converts model time to time in CFC_BC_file
- NOAA-GFDL/MOM6@c2a30839c Improve performance of hor_bnd_diffusion
- NOAA-GFDL/MOM6@f666a67cb Rename module to hor_bnd_diffusion
- NOAA-GFDL/MOM6@9b4bd84b5 Add mssing call to get_param for FPMIX
- NOAA-GFDL/MOM6@864506e85 Add omega_w2x to fluxes and forces
- NOAA-GFDL/MOM6@7624a83b8 Add missing use for vertFPmix
- NOAA-GFDL/MOM6@143d11752 Updates to vertFPmix
- NOAA-GFDL/MOM6@cb65bdcef Change name of logical
- NOAA-GFDL/MOM6@9c103f1f9 First draft for fpmix
- NOAA-GFDL/MOM6@b7390f7e0 Makes set_u_at_v and set_v_at_u public
@mom6bot mom6bot mentioned this pull request Oct 25, 2023
Merged
marshallward pushed a commit that referenced this pull request Oct 25, 2023
@mom6bot @marshallward
MOM6: ice shelf dHdt and optimization
1e6dac0 
- NOAA-GFDL/MOM6@c9fc30d61 ice shelf dHdt and optimization
- NOAA-GFDL/MOM6@3d07e5beb Comment omega_w2x entries in nuopc_cap
- NOAA-GFDL/MOM6@3720b9920 Comment all omega_w2x entries
- NOAA-GFDL/MOM6@e2bbb08dc Set fpmix to false by default
- NOAA-GFDL/MOM6@5e6e6576f remove fms_io_mod import
- NOAA-GFDL/MOM6@de55fd6d2 fix multiinstance log filename correction and remove FMS1 io api calls.
- NOAA-GFDL/MOM6@d363034fc Deprecate mct cap (#257)
- NOAA-GFDL/MOM6@5bc0c5e07 Pass wavebands from coupler to wave_parameters_CS (#255)
- NOAA-GFDL/MOM6@be40a4136 add run time info (#114)
- NOAA-GFDL/MOM6@d9aa751a4 Revert order of variables in vertFPmix
- NOAA-GFDL/MOM6@66fd876af Removed L_diag and moved variables in vertFPmix
- NOAA-GFDL/MOM6@7b7052e9b Describe local variables and make code consistent
- NOAA-GFDL/MOM6@d4aa10857 Add Leith+E (#251)
- NOAA-GFDL/MOM6@c57789f41  Rearrange do-loops and if statements
- NOAA-GFDL/MOM6@2f34d6521 Merge latest mom-ocean main (#254)
- NOAA-GFDL/MOM6@8ec0de7b0 Merge remote-tracking branch 'MAIN/main' into feature/update-to-main-20230811
- NOAA-GFDL/MOM6@27518f750 Make neutral diffusion work with 3D diffusivities
- NOAA-GFDL/MOM6@a58803372 Make HBD work with 3D diffusivities
- NOAA-GFDL/MOM6@36c1e266b Make tracer diffusivities 3D
- NOAA-GFDL/MOM6@cf29f1beb Allocate hbl
- NOAA-GFDL/MOM6@53ccbc329 Fix line length
- NOAA-GFDL/MOM6@8234e696d Add hbd to the control structure
- NOAA-GFDL/MOM6@b4bd22322 Output relevant fields when diff or visc < 0
- NOAA-GFDL/MOM6@61baca8ea Option to taper neutral diffusion
- NOAA-GFDL/MOM6@8812ba999 Merge remote-tracking branch 'gustavo/fpmix_draft_17may2022' into fpmix_draft_18April2023
- NOAA-GFDL/MOM6@32b969ef4 Accommodate multi-instance runs in CESM (#241)
- NOAA-GFDL/MOM6@ebf11d7c7 migrate nearly all refs to CFC_cap into MOM_tracer_flow_control and MOM_CFC_cap
- NOAA-GFDL/MOM6@a697159a2 Obsolete the USE_LATERAL_BOUNDARY_DIFFUSION option
- NOAA-GFDL/MOM6@eff5036e0 Unit tests and final cleaning
- NOAA-GFDL/MOM6@b85581ea8 read atm CFC hemispheric aveages from CFC_BC_FILE, instead of 2D fields
- NOAA-GFDL/MOM6@db06a5494 add CFC_BC_year_offset, converts model time to time in CFC_BC_file
- NOAA-GFDL/MOM6@c2a30839c Improve performance of hor_bnd_diffusion
- NOAA-GFDL/MOM6@f666a67cb Rename module to hor_bnd_diffusion
- NOAA-GFDL/MOM6@9b4bd84b5 Add mssing call to get_param for FPMIX
- NOAA-GFDL/MOM6@864506e85 Add omega_w2x to fluxes and forces
- NOAA-GFDL/MOM6@7624a83b8 Add missing use for vertFPmix
- NOAA-GFDL/MOM6@143d11752 Updates to vertFPmix
- NOAA-GFDL/MOM6@cb65bdcef Change name of logical
- NOAA-GFDL/MOM6@9c103f1f9 First draft for fpmix
- NOAA-GFDL/MOM6@b7390f7e0 Makes set_u_at_v and set_v_at_u public
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@breichl @Hallberg-NOAA